summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mergify.yml14
1 files changed, 3 insertions, 11 deletions
diff --git a/.mergify.yml b/.mergify.yml
index e7c5b35..9bc4b9b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -5,17 +5,9 @@
pull_request_rules:
- name: Automatic merge on approval
conditions:
- - "#approved-reviews-by>=1"
- - "status-success=pytest (ubuntu-latest, 3.7)"
- - "status-success=pytest (ubuntu-latest, 3.8)"
- - "status-success=pytest (ubuntu-latest, 3.9)"
- - "status-success=pre-commit"
- actions:
- merge:
- method: rebase
- - name: Automatic merge from Flameeyes
- conditions:
- - "author=Flameeyes"
+ - or:
+ - "#approved-reviews-by>=1"
+ - "author=Flameeyes"
- "status-success=pytest (ubuntu-latest, 3.7)"
- "status-success=pytest (ubuntu-latest, 3.8)"
- "status-success=pytest (ubuntu-latest, 3.9)"